Assembly clean up
